Changed the functions to return GdkPixBuf* instead of ArtPixBuf*.

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 9faa1c4cd6c95a3851a6a6557be37a2e87a1dd02..87b3ee1502ebd24190f4cabe02afc59f64797602 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -11,6 +11,9 @@
        * src/gdk-pixbuf-drawable.c: Added #include "gdk-pixbuf-drawable.h"
        to fix compilation.
 
+       * src/gdk-pixbuf-drawable.[ch]: Changed functions to return
+       GdkPixBuf* instead of ArtPixBuf*.
+
 1999-09-22  Michael Meeks  <michael@nuclecu.unam.mx>
 
        * src/gdk-pixbuf.c (gdk_pixbuf_new): created.

diff --git a/gdk-pixbuf/gdk-pixbuf-drawable.h b/gdk-pixbuf/gdk-pixbuf-drawable.h
index a7321654f40cc83bc3ac410079151a6585c5045d..5e8ed5dc6017232d11143c9a6f0af8da3bc14b6e 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-drawable.h
+++ b/gdk-pixbuf/gdk-pixbuf-drawable.h
@@ -1,12 +1,14 @@
 #ifndef _GDK_PIXBUF_DRAWABLE_H_
 #define _GDK_PIXBUF_DRAWABLE_H_
+
 #include <gdk/gdk.h>
 #include <gdk-pixbuf.h>
 
-ArtPixBuf *art_pixbuf_rgb_from_drawable  (GdkWindow *window,
+GdkPixBuf *gdk_pixbuf_rgb_from_drawable  (GdkWindow *window,
+                                         gint x, gint y,
+                                         gint width, gint height);
+GdkPixBuf *gdk_pixbuf_rgba_from_drawable (GdkWindow *window,
                                          gint x, gint y,
                                          gint width, gint height);
-ArtPixBuf *art_pixbuf_rgba_from_drawable (GdkWindow *window,
-                                          gint x, gint y,
-                                          gint width, gint height);
-#endif
+
+#endif /* _GDK_PIXBUF_DRAWABLE_H_ */

diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c
index a8cc75b440056b6a48aeb85bd87aafefe537cef5..39697633033f35a2d73a76d173cecc3f2adbf403 100644 (file)
--- a/gdk/gdkpixbuf-drawable.c
+++ b/gdk/gdkpixbuf-drawable.c
@@ -14,8 +14,8 @@
 
 /* private function */
 
-static ArtPixBuf *
-art_pixbuf_from_drawable_core (GdkWindow *window,
+static GdkPixBuf *
+gdk_pixbuf_from_drawable_core (GdkWindow *window,
                               gint x, gint y,
                               gint width, gint height,
                               gint with_alpha)
@@ -113,24 +113,26 @@ art_pixbuf_from_drawable_core (GdkWindow *window,
                g_error ("art_pixbuf_from_drawable_core (): Unknown depth.");
        }
 
-       return with_alpha ? art_pixbuf_new_rgba (buff, width, height, rowstride) :
+       art_pixbuf = with_alpha ? art_pixbuf_new_rgba (buff, width,  height, rowstride) :
                art_pixbuf_new_rgb (buff, width, height, rowstride);
+
+       return gdk_pixbuf_new(art_pixbuf, NULL);
 }
 
 /* Public functions */
 
-ArtPixBuf *
-art_pixbuf_rgb_from_drawable  (GdkWindow *window,
+GdkPixBuf *
+gdk_pixbuf_rgb_from_drawable  (GdkWindow *window,
                              gint x, gint y,
                              gint width, gint height)
 {
-       return art_pixbuf_from_drawable_core  (window, x, y, width, height, 0);
+       return gdk_pixbuf_from_drawable_core  (window, x, y, width, height, 0);
 }
           
-ArtPixBuf *
-art_pixbuf_rgba_from_drawable  (GdkWindow *window,
+GdkPixBuf *
+gdk_pixbuf_rgba_from_drawable  (GdkWindow *window,
                               gint x, gint y,
                               gint width, gint height)
 {
-       return art_pixbuf_from_drawable_core  (window, x, y, width, height, 1);
+       return gdk_pixbuf_from_drawable_core  (window, x, y, width, height, 1);
 }